From: Ian Campbell Date: Thu, 28 Aug 2014 20:25:21 +0000 (+0100) Subject: tools: (lib)xl: remove stray uses of build_info->u.pv.{kernel, ramdisk, cmdline} X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~4497 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=19bb008e393b17ad020b97ab82ad55df4bbe9451;p=xen.git tools: (lib)xl: remove stray uses of build_info->u.pv.{kernel, ramdisk, cmdline} The commit 11dffa2359e8 "xen: pass kernel initrd to qemu" deprecated these in favour of build_info->{kernel,ramdisk,cmdline} but missed a couple of uses. The ARM case breaks guest boot by omitting the command line from the DTB while the xl SXP one is mostly cosmetic. Signed-off-by: Ian Campbell Cc: Chunyan Liu Reviewed-by: Julien Grall --- diff --git a/tools/libxl/libxl_arm.c b/tools/libxl/libxl_arm.c index 3d3024209e..a122e4aac6 100644 --- a/tools/libxl/libxl_arm.c +++ b/tools/libxl/libxl_arm.c @@ -191,8 +191,8 @@ static int make_chosen_node(libxl__gc *gc, void *fdt, bool ramdisk, res = fdt_begin_node(fdt, "chosen"); if (res) return res; - if (info->u.pv.cmdline) { - res = fdt_property_string(fdt, "bootargs", info->u.pv.cmdline); + if (info->cmdline) { + res = fdt_property_string(fdt, "bootargs", info->cmdline); if (res) return res; } diff --git a/tools/libxl/xl_sxp.c b/tools/libxl/xl_sxp.c index 48eb608386..1c983524d8 100644 --- a/tools/libxl/xl_sxp.c +++ b/tools/libxl/xl_sxp.c @@ -144,9 +144,9 @@ void printf_info_sexp(int domid, libxl_domain_config *d_config) break; case LIBXL_DOMAIN_TYPE_PV: printf("\t\t(linux %d)\n", 0); - printf("\t\t\t(kernel %s)\n", b_info->u.pv.kernel); - printf("\t\t\t(cmdline %s)\n", b_info->u.pv.cmdline); - printf("\t\t\t(ramdisk %s)\n", b_info->u.pv.ramdisk); + printf("\t\t\t(kernel %s)\n", b_info->kernel); + printf("\t\t\t(cmdline %s)\n", b_info->cmdline); + printf("\t\t\t(ramdisk %s)\n", b_info->ramdisk); printf("\t\t\t(e820_host %s)\n", libxl_defbool_to_string(b_info->u.pv.e820_host)); printf("\t\t)\n");